x11: Drop GdkX11Visual as public api

There was no useful functionality left here,
so just remove this from the api altogether.

diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 871c8129f9533e6328c8aa5f5ccf62a78627e8d1..74911ddbd94915e2129efc74ccdbd29c5b279d77 100644 (file)
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -29,7 +29,6 @@
 #include "gdkx11glcontext.h"
 #include "gdkx11screen.h"
 #include "gdkx11window.h"
-#include "gdkx11visual.h"
 #include "gdkvisual-x11.h"
 #include "gdkx11property.h"
 #include <X11/Xatom.h>

diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h
index af5ea6586dcadc2bbc5d9d037e6b336b6cbf2221..f5af2115df2ba64c72f6954ca8de3a541ab3f90a 100644 (file)
--- a/gdk/x11/gdkglcontext-x11.h
+++ b/gdk/x11/gdkglcontext-x11.h
@@ -29,7 +29,7 @@
 
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkx11visual.h"
+#include "gdkvisual-x11.h"
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 

diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index 482052626bab37edb161fa5e88686cfbbe064d69..0b14d31df0e7c5063b811b14705da49220640cd8 100644 (file)
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -23,7 +23,7 @@
 #define __GDK_X11_SCREEN__
 
 #include "gdkx11screen.h"
-#include "gdkx11visual.h"
+#include "gdkvisual-x11.h"
 #include <X11/X.h>
 #include <X11/Xlib.h>
 

diff --git a/gdk/x11/gdkvisual-x11.h b/gdk/x11/gdkvisual-x11.h
index 807c57794620db4f3b8aa29adace671b4a829f17..9b3bdd5ee3ff1797be9fbc8a50baab2aa1bdbd87 100644 (file)
--- a/gdk/x11/gdkvisual-x11.h
+++ b/gdk/x11/gdkvisual-x11.h
@@ -18,6 +18,34 @@
 
 G_BEGIN_DECLS
 
+#include <gdk/gdk.h>
+#include <gdk/x11/gdkx11screen.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+G_BEGIN_DECLS
+
+#define GDK_TYPE_X11_VISUAL              (gdk_x11_visual_get_type ())
+#define GDK_X11_VISUAL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_VISUAL, GdkX11Visual))
+#define GDK_X11_VISUAL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_VISUAL, GdkX11VisualClass))
+#define GDK_IS_X11_VISUAL(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_VISUAL))
+#define GDK_IS_X11_VISUAL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_VISUAL))
+#define GDK_X11_VISUAL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_VISUAL, GdkX11VisualClass))
+
+typedef struct _GdkX11Visual GdkX11Visual;
+typedef struct _GdkX11VisualClass GdkX11VisualClass;
+
+typedef enum
+{
+  GDK_VISUAL_STATIC_GRAY,
+  GDK_VISUAL_GRAYSCALE,
+  GDK_VISUAL_STATIC_COLOR,
+  GDK_VISUAL_PSEUDO_COLOR,
+  GDK_VISUAL_TRUE_COLOR,
+  GDK_VISUAL_DIRECT_COLOR
+} GdkVisualType;
+
 struct _GdkX11Visual
 {
   GObject parent_instance;
@@ -35,6 +63,15 @@ struct _GdkX11Visual
   Visual *xvisual;
 };
 
+GType    gdk_x11_visual_get_type          (void);
+
+Visual * gdk_x11_visual_get_xvisual       (GdkX11Visual *visual);
+
+#define GDK_VISUAL_XVISUAL(visual)    (gdk_x11_visual_get_xvisual (visual))
+
+GdkX11Visual* gdk_x11_screen_lookup_visual (GdkX11Screen *screen,
+                                            VisualID      xvisualid);
+
 G_END_DECLS
 
 #endif

diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
index 90b47dcff8947c3c65154dc3367d8afed63db302..d18abfa48bfbd3b14a477401a96ac7289e80c001 100644 (file)
--- a/gdk/x11/gdkx-autocleanups.h
+++ b/gdk/x11/gdkx-autocleanups.h
@@ -31,7 +31,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DragContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11GLContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Window, g_object_unref)
 
 #endif

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 87960fdfc8e3d5f843a7ab07fdc57b98ccaa1283..153b4a501e994068ed715ff7dceba006f7fdc191 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -48,7 +48,6 @@
 #include <gdk/x11/gdkx11screen.h>
 #include <gdk/x11/gdkx11selection.h>
 #include <gdk/x11/gdkx11utils.h>
-#include <gdk/x11/gdkx11visual.h>
 #include <gdk/x11/gdkx11window.h>
 
 #include <gdk/x11/gdkx-autocleanups.h>

diff --git a/gdk/x11/gdkx11visual.h b/gdk/x11/gdkx11visual.h
deleted file mode 100644 (file)
index 2bdd777..0000000
--- a/gdk/x11/gdkx11visual.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_X11_VISUAL_H__
-#define __GDK_X11_VISUAL_H__
-
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
-#endif
-
-#include <gdk/gdk.h>
-#include <gdk/x11/gdkx11screen.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_X11_VISUAL              (gdk_x11_visual_get_type ())
-#define GDK_X11_VISUAL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_VISUAL, GdkX11Visual))
-#define GDK_X11_VISUAL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_VISUAL, GdkX11VisualClass))
-#define GDK_IS_X11_VISUAL(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_VISUAL))
-#define GDK_IS_X11_VISUAL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_VISUAL))
-#define GDK_X11_VISUAL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_VISUAL, GdkX11VisualClass))
-
-typedef struct _GdkX11Visual GdkX11Visual;
-typedef struct _GdkX11VisualClass GdkX11VisualClass;
-
-typedef enum
-{
-  GDK_VISUAL_STATIC_GRAY,
-  GDK_VISUAL_GRAYSCALE,
-  GDK_VISUAL_STATIC_COLOR,
-  GDK_VISUAL_PSEUDO_COLOR,
-  GDK_VISUAL_TRUE_COLOR,
-  GDK_VISUAL_DIRECT_COLOR
-} GdkVisualType;
-
-GDK_AVAILABLE_IN_ALL
-GType    gdk_x11_visual_get_type          (void);
-
-GDK_AVAILABLE_IN_ALL
-Visual * gdk_x11_visual_get_xvisual       (GdkX11Visual *visual);
-
-#define GDK_VISUAL_XVISUAL(visual)    (gdk_x11_visual_get_xvisual (visual))
-
-GDK_AVAILABLE_IN_ALL
-GdkX11Visual* gdk_x11_screen_lookup_visual (GdkX11Screen *screen,
-                                            VisualID      xvisualid);
-
-G_END_DECLS
-
-#endif /* __GDK_X11_VISUAL_H__ */